*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7d7529c31509979867fa961b79e8f5b4e87d7e2..c758e34089ba6ea6fc5d2f26335dbdb7372fccd8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-14  Richard Stallman  <rms@gnu.org>
+
+       * startup.el (use-fancy-splash-screens-p): Use frame-height
+       instead of window-height.  Pass frame to image-size.
+
 2006-12-13  Kenichi Handa  <handa@m17n.org>
 
        * international/mule-cmds.el (set-locale-environment): Set

diff --git a/lisp/align.el b/lisp/align.el
index b49979059a362fbbc7b17c78354493c22fe35ee7..a3cc531d7960ed1888849525fa3312c46176d23d 100644 (file)
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -4,6 +4,7 @@
 ;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
+;; Maintainer: FSF
 ;; Keywords: convenience languages lisp
 
 ;; This file is part of GNU Emacs.